Remove old unnecessary stuff.
Removed more junk