Moved unnecessary code from autorun to config