Removed unneeded checks and commented code.