Conversion to YarpImageOf now works
Cleanup commented code