deleted redundant things