Remove unused headers
Improve envdef.py example
Remove deprecated method in test