Removed some redundant code.  keep looking over.