Cleared some redundant code

Cleared some redundant code, still lot more to clear.