CLEANUP: Removed some legacy and not-yet-working code.