Removed redundant and unused code