Topic/cleanup

Removes a bunch of files not actually used