more cleanups
remove stuff