Migration to SDL 2.0 + API Cleanup