Major changes to removal()