Removed legacy implementations.