missed clean up from my older implementation