Removed dependancy on laravel stuff