More measure clean up