- Removed redundant functions.