Revert "more l2 stuff"

This reverts commit 568c9f5abe8d17c418511c628b6f384c190986db.