redundant stuff removed