Clean up
Include apache.common.lang3 in target platform