Remove obsolete style settings
Fix unreachable styles, wrong ordering