Remove apache-common dependency