Remove stage1.5. Move former contents of the aforementioned to stage1. add modeswitch code.