Cleanup dependencies
Remove CPP pragma