issue#394 - resolve issue#394's 1&2 ticket

resolve issue#394's 1&2 ticket
It's not a good idea to comment out code, because people will be confused later by its presence.  It's better to rely on git history, and if we need to get this back, we can always go back through the history of the code to find the change.  If you're happy removing this code, just delete it, never comment it out.  Obviously while you're testing you might do it this way, but when you want to submit your code, remove all the lines you commented out.