Pruned the unecessary and obsolete