Extra clean up