Removing old code that somehow got back in