Cleanups from merge
Cleanup to merged code