Removing some old entries from autoloader.

Change-Id: I6bced3f8f9f97ab3580c6cfa0a3a2126d39fec6a
Merge "Removing some old entries from autoloader."