added node removal/insertion, removed cleanup