remove *almost* all autoloading
test was not integration