Cleanup and updates
Cleanup
Temporarily adding files