Remove legacy code
Fix cscope