Base: Remove old, unused code