This should not be here....
commented code removed, unused variables removed