Accessed and duggaed fixes
Removed cruft