post-hasPart implementation code cleanup