Remove unused or redundant code & class members