Remove previous handlers, minor improvements