cleaning up ICP writer to prepare for tests