Remove manual autloloading code

Change-Id: Ib1f85bc7f74ab970d322be08392fa976dcd811d4