Some cleanup for pymdht