make valid method private + remove unused files and statements