code cleanup

- remove autodiscover