further updates to controllers and models, removed old files