remove more compatibility stuff