Remove old controllers and some unused model code