really use --pull again, cleanup code