Cleaning all references and using statements