+ got rid of some legacy code