Cleanup
Merge and cleanup