Optim - Remove some source loading requests