Ton of deletions of unnecessary stuff