Removed some clutter, fixing up packages and environment