Minor refactor
Replace by screen quad
Remove image effects