fix previous clean up