Massive Cleanup + YT Functionality Restored