update to latest sandstone assets and cleanup