removed redundant and unused code