contrib directory cleanup