Don't need these, refactored to depend on apache commons