- added goals cleanup