Changed remove based on feedback from Dan Olson