Remove superflous types in constants