Code cleanup - removed unused references and dependencies