Some redundant stuff removed.