SQUASH some cleanup