Remove bugfix and final, hfoss specific assigns