removed redundant constants