Tidy up

Removal of uneccassary DIAGNOSTICS