Misc: Remove toolbar as dependency