Clean up library/impl dependencies