some cleanup in yupe core classes