Removed duplicate models that I accidentally left in during the merge