Remove obsolete returns