preliminary version with scripted cleanups