Clean up for redo of tutorials 1 & 2