Removed apitrace. Will add it again if required.