Remove some unused definitions from src/s