[Misc] Remove unused code