allow delete goals and small refactor