Edited remove method

Still need to do a lot more testing, and figure out the (empty) call..