remove commented out portions of code
remove unnecessary using directive