Removed highly redundant code (that also double sanitized data).