Additional clean up