clean-up old marks of bs2/bs3 support