further cleanup POMs