cleanup, enhanced tutorial e11