[#561] Removed dead and unused code to clear compilation warnings.