Minor clean up of unused code