Removed volume code
Commented out unused headers