Remove unnecessary lines, Fix bug