ughh. moar merge cleanup