trying to clean up the mess