Compatibility cleanup