clean out some redundant things