Code Cleanup: Fix tools

All the fix tools share common code with an empty else
clause markeed with XXX. removed the redundant code.