Large Amounts of Cleanup of Code