clean up deprecated stuff