minor: cleanup some redundant code