Various code cleanups
Remove some unused code, and move the options base class to a more appropriate place.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Remove some unused code, and move the options base class to a more appropriate place.