Removed wasteful double-normalize