teryror More cleanup work