Remove old screens
Merge branch 'master' of github.com:mythern/trashcan
Remove some more