Removed unused references and usings