Remove obsolete stuffs like old bell handling