Formatting cleanup
Removing unused files