Removing logic from distro