Revert "cleanup unused code, return annotation fixed"

This reverts commit 4d17616f6fc1290b38078f4fb1a60af48a1712ec.