Clea up constants