Complete 2.2.5 Get rid of All teacher file stuff

also fixed a small warning in model