removed redundant part