Updating to new elixr, minor cleanup