Removed dependency on WPFExtensions by integrating all required controls
Cleanup