Removed unnecessary calls to get html template