Cleanup
Cleanup
Remove old code
Cleanup
Remove code that is not necessary anymore
Remove old TODO for passes