Renamed and removed from widget files