Removing unneeded bookkeeping