remove unused class and layout