cleaning up for new code