fixing up the removes