comments and remove redundant files