Removed unused references and refactored code