Removed code from a bad merge