removed redundant definitions