Goals are now removed with subtree; minor fixes