Fixed problems with branch feature/16449

A bunch of files from the branch that weren't necessary had been merged, and models.py wasn't fixed. It still had the
differences between the branches marked out.