Remove some redundant code for convention