Bump version and removing todos