move obsolete code out of mix sources