Updates for elixir/master
Remove old methods