Added support for legacy notices
Removing unused define