removed excess things