remove redendency in code