Import cleanup

AFDP-153