remove some definitions that are no longer necessary