cleaned up notices