Fixed filename and removed some junk code