remove more redundant code