remove unused files + small fixes