removed todos
fixing behaviour on deletion

fix #12