Remove some BC stuff and some non-existing values