Clear some redundant code