deleted redundant codeblocks