modified the removes to work correctly with the destroy