Improvement : Remove trivial codes.