Remove extra confusing methods from gateway