Remove some trash code