Removed some old crap from the debugging day
added child_removed support