remove helpers and comments