remove obsolete
Merge branch '4-return' into 13-name-atomic