Widgets clean up

Removing unused classes