further clean-up for polemy2d