These debug calls should also be removed