Removed unused crap.
Merge branch 'sandbox' into int
Merged from uat.