Cleanup chores spec