Bumping Version and removing cruft