cleanup some overrides