removed redundant stuff