Minor cleanup, removed some redundant code.