Removing unneeded code
Removing unneeded code
Goes across both screens