removed some dead code, switched some int's to booleans
removed some dead code, switched some int's to booleans

sassoftware/conary,sassoftware/conary,sassoftware/conary,sassoftware/conary,sassoftware/conary