Main Branch Cleanup