Removed all unused implementations