Step1. Removal
Step 2 Rejuvenation
Merge pull request #1 from LordIllyohs/master

Prep for 1.7