Added first part of exclusion / removed some old frontend code