Revert "Derp and Derp v2 combined"

This reverts commit c75050932df5f72e9372482cf4da60739c4c108c.
Revert "Update default.xml"

This reverts commit ddcbec964d015ee03484d5b3a9de0fe830e76ff6.
Revert "Update default.xml"

This reverts commit 754344af622c7dc7f6d0a170bd829b1703f12ef3.