Removing the autoload issues.

Removed autoload requirement.