Merge cleanup branch