Fix busy bug and remove bad .gitmodules entry