added remove, more cleanup