-- remove unneeded comments