Better request cleanup