Removed diagnostic messages and old code
Removed diagnostic messages