Clean up economy code