Revert "Vanilla + BL Market"

This reverts commit 7bde1bc6e051390e443be2086ca0db03ff0c3300.