Clearance related changes made