structure and writing goal service cleanup