Remove Unnecessary .then