Add the cleanup for existing spot request