Cleaned Constants File

Removed unused Constants and made use of some others in the appropriate
procedure files.