also removed some redundant stuff