Cleanup
Remove contrib from autoloader
Cleanup