Remove test code
Simplify autoload config