more hardcoded removal