Remove unused stuff - promote true dir content.