Cleaned up previous commit.

Removed many functions for stated reasons.
Merge branch 'master' of https://github.com/blackening/cs3216-dest