Production Code V1

Cleaned out all the old unnecessary code, this should be production code
V1 (still needs QA, but no other changes are expected currently for V1)