Merge "removed dead code that was causing a warning"