Some final changes for 3.1, remove beta tag