cleaning up for new direction