removed redundant codes after initial commit