removed unnecessary lines that may cause error