Removing 'legacy' functionality.