GUAC-806 Removed unnecessary changes.