Format, cleanup, remove some unneeded things from apache commons lib