Remove no longer existing classes from autloading global

Change-Id: Ic4d371ae139dd670e176cb085f4d080ba67d52ba
Merge "Remove no longer existing classes from autloading global"