Remove Technical Debt from MSB code