Added padding removal