removed unwanted stuff.
Merge branch 'adaptive' into dev