Small cleanups
remove excessive bookkeeping
Avoid some unecessary work