More cleaning up
Removed duplicate files