Remove some ancient stuff