tidy removal functions (fixes #6)