Removed autoload detection as this isn not required (was just going a little insane)