Cleaning up extras. Still checking