Remove obsolete class use - initial cleanup
Code remove + Toolbar Integration