Code cosmetics - remove unused bits and simplify.