Removing unused / useless code