Cleanup and maven