introduced OCM_USE_XXX flags for each package
some cleanup