Cleanup - remove old and misnamed files