[erlang/f20] (7 commits) ...Removed leftover