Cleanup from boto refactor.