Remove unused class and layout
Merge branch 'GT-45' into Email_Updates