Removed commented out block