sanity clearance

Removing old references and unused code
removing and sorting using statements
Merge pull request #5 from astaykov/experimental

sanity clearance