Cleaning up

Cleaning up bad files, some other changes
More cleaning