Remove unncessary Sonar variables