make removal more clean