Removing old Buffet and CtrlP stuff