Whoops, merge cleanup