Add cdd, remove unnessecary function calls