cleaned some redundant stuff