Remove unused modules from osl-branch