Remove some redundant stuff