XD-1022. Clean imports
XD-1022. Favour Assert over Preconditions.