structral adjustment, remove redundant design