Cleanups

mostly the last structural changes within the frontend before RC1