Removed most of the unneeded constants