removed autoloader as most of it was redunant code anyway