Revert "Not needed"

This reverts commit 578ca5d94cdd9ddb3d955a9b25dd8f3514c1d46e.
Various Updates