Revert "Add signal type"

This reverts commit 553aa52df89ae14ba1d6c8aa630e68d027dcb7c9.
Revert "Remove mark function"

This reverts commit 3debe95704fcf35a9921d124b98a84cb2be51299.