Update to clean up