Removing redundant codes and logic.

Signed-off-by: JerinJ <jerinj@cybage.com>