Dead Code removed 

Fixes for #22.
Unused constants marked as deprecated.