Removed lots of unneeded helper files and one spec