Removing more redundant functions.
Few more changes.