fixes #2440 remove unused files, code, unnecessary require statements