unused files removed, missed annotations added