3.12: remove I3statushandler
3.12: Move code around