Cleaned up in tutorial