started implementing removing feature