Cleaning up notices