Removed more redundant code.