[TIMODOPEN-435] Removed repeated code