sriprasanna - removing unnecessary code