Remove dependancy on ApacheCommons