Back to Second Commit, removed commented code