Remove redundant code. Improve performance.