Merge cleanup part 1
Merge cleanup part 2