Cleanup dead code, use platform tools