Remove features improved