cleaning up contrib and manifest