Even more cleanups.
DEVELOPMENT-MESSAGE is not DEVELOPER-NOTE.
Removed unused code.