Remove extra files and clean up for 3.1 release