remove version 1 code