Unneeded comments removed