More cleanup for different requests