Simplify initial conditions

Replace when initial() for a variable with initial equation for a fixed=false parameter