Removing duplicated call and cleaning up