Cleanup unrelated changes, fixed crash on startup