Bumped version to 2.1 and removed hugemem switch