Issue 439

Clean up of all the convert stuff