Global usage improvement
Removed unused file
Deferred working correctly (at least!)