Removed commented out code (unused)