Removed unused imports, removed one "main" method