jordan-common: Cleanup