Remove global _system handler
2 files changed