Remove model stuff (for now)