Removed some stuff moved to MPSA
Merge pull request #129 from Andrew2448/master

Removed more stuff that was migrated to MPSA...someday I'll get it all.