cleaning up
added remove functionality