Jafari&Job: removed some unnnecssary code.