Further economy cleanup