Removed redundant/unnecessary leftover bits of code