Simplified code - removed methods not in use