Major Refactor

All unneeded functionality removed. Code needs to be cleaned up to
removed any unneeded/unused fragments.