Remove contrib convert scripts as they are not compatible with new format
Update sample info file to new format
Revert to old scaling geometry
Remove TODO file