Remove a pile of backwards compatibility for 3.0