Updated constant names
Removed superfluous libraries