remove comments
fixps