remove unused files and some fixes