Fix e-notice, remove legacy code pattern