remove comments and hot fixes