Fix Files and Groups controllers, cleanup unused stuff