Get rid of leftovers and add my name to the PSE-related classes.