Drycode rewrite - removal of unneeded/unused functions