- Clean up unused code

- Keep Screen on