diff --git a/user_channel/passwd_mgr.cpp b/user_channel/passwd_mgr.cpp
index d4ff39f..525b2b7 100644
--- a/user_channel/passwd_mgr.cpp
+++ b/user_channel/passwd_mgr.cpp
@@ -41,11 +41,6 @@
 
 #define META_PASSWD_SIG "=OPENBMC="
 
-static inline size_t blockRound(size_t odd, size_t blk)
-{
-    return ((odd) + (((blk) - ((odd) & ((blk)-1))) & ((blk)-1)));
-}
-
 /*
  * Meta data struct for encrypted password file
  */
@@ -389,10 +384,7 @@
             }
             linePtr = strtok_r(NULL, "\n", &nToken);
         }
-
-        // Round of to block size and padding remaing bytes with zero.
-        inBytesLen = blockRound(bytesWritten, EVP_CIPHER_block_size(cipher));
-        std::memset(&inBytes[0] + bytesWritten, 0, inBytesLen - bytesWritten);
+        inBytesLen = bytesWritten;
     }
     if (!isUsrFound)
     {