Cleanup
Preparing for sumit