Removed debug/commented out code