cleanup and seems to work locally