Some other clean up