goblin backend cleanup