Fix notice removing