A bit more cleanup of unused and unneeded code