Further clean ups