Removed old changes
Nightly build 21