removed unnecessary listeners and Timer