Remove notes
Add notice module
Merge branch 'i37' into wip