ENH: Cleaned legacy libraries