Much cleanup and push