Removed debugging method
Removed old implementation
Renamed new implementation