Add forget function, tidy up