Remove ugly compatibility stuff