Revert "Returning extra features back to luna"

This reverts commit 9d20933a0c1628fba4a1af463659d812c6091365.