deleted redundant stuff