cleaned up convert-entries