cleanup comments and deprecated code