Remove unused class and layout