Removed old usr dir

Bunch of old and unsed code in there.