Massive 'use' overhaul

It was long overdo