Clean some redundant code