Clean up usings / uncommented code