Fix format and remove network specific lines