Remove dead code
Fix build error