Removed unused packages, reordered to match tutorial.