- big cleanup of internal deps