rid warnings, remove stuff