Removing legacy, non-working functionality...