remove unuseful logic