clean up #314