Removing not needed code to make code base slim.