Remove dependency on local user script