Remove unnecessary custom extensions
Widget creation simplification