sanity clearance

Removing old references and unused code
removing and sorting using statements