Revert "l2 stuff"

This reverts commit 963ced31b4917192137666d55673ce8950496bf0.