erm cleanup to use auto-complete from repo