Remove unused batch methods
Make Set methods consistent