Remove unneded code. (Code removed is in DDBC)