Add back required remove function and remove debugging print statements