Tidied up some code

Removed more legacy code from origin repo.