cleaning up deprecated stuff