remove more redundant stuff