Remove unnecessary custom line-heights to simplify the code

Change-Id: I54b296062dfa77405def55c68d4a87831c2481e6