Cleanups and shortcuts controller/model dummies