Nepali Congress leader Shekhar Koirala stressed the need to remove the Central Investigation Bureau and Department of Revenue Investigation from the Office of the Prime Minister and Council of Ministers and keep both the agencies under the ministries as in the past.