Fix bugs and unnecessary code