Notes, cleanup