Delete stuff that was either class overrides or won't carry forward into the namespaces
Drop some stuff there's just no use for now