Taking down technical dept (from SONAR)