Removed commented code (for realz)