Remove unneeded comments and support file