Adding more stuff for GA
Cleanup unused files