Fixed remove method, cleaned up a bit