Added more things to remove