I felt there are several code path from old codebase that I forget to clean up. Let me clean them.