Slight clean-up of unneeded things