directory cleanup, tweaks for CE