new tutorial and cleanup