Revert "Layout Assignments"

This reverts commit 23af612ad919a31eac83bcc192d22422bb2132cf.