Fixed listeners, removed unnecessary code.