Base: Remove unused code