Cut out a bunch of calls that we may not need to begin with