Remove some inactive code