Getting rid of some YCP-style code