Finally got rid of the pointless dryrun functions and implemented dry-running directly into the original functions