Remove old code
Version bumps