Removed unneeded files, fixed contact/contacts issue, ran reek on models