Finished cleaning up merge