few more cleanup rules