Finished remove function, seems to work.