minor cleanup
fix stupid mistake
add remove function