Cleanup dep, remove headers