Remove state + logic with no effect
Remove (unneccessary?) object allocation
Add selfie