Remove getBaseSelect() and replace with select()