cleaning up the two versions