Code clean-up. Remove redundant code.