REVIEW: Cleanup of nexus-core packages