more hardcoding removal