get rid of org.apache.*