1.2 version cleanup added