some general cleanup on alarm handlers