Cleared some redundancies