clean up base & 1.7