Work in progress.
Please take a look whether it moves in desired direction. Only unregisterTrigger function is moved now.
