Remove the defining of extra constants. Close #215