Add removal of more things