assignment cleanup and static DS packet fix