Clean up after hp 2013.2