Trap system refactoring before its too late.