Cleaning out the ModelControllers and the Tables. Trying to simplify things now