final clean-up for v1.1