Removing unnecessary, fixing necessary