Remove behaviour that isn't used