- removed some redundant code.