cleanup of unused rules, fixed indent