Fixed rules and removed less useful tools