Cleaning up unused implementations