Cleaning up merge
Cleanup merge