rm redundant stuff