Some cleanup to syscall mechanism