Cleaning up the code
Fixed an issue where a list of removes didn't work