Removed dead code & files

(tests to be added back later)