Code cleanup: Unnecessary code is removed.
Code refactoring is done.