better translation messages
remove unnecessary templates