restoring cleanup sanity, removing prints