Remove superfluous autoload includes