Removed problematic comments