Revert "added toolbar and switch prototypes"

This reverts commit 1268cc357a3eeddf34f2533c708664af09776b5f.