Removed `org.apache` dependencies