With the above change you can remove the following