various cleaning up