Redundant stuff removed