Cleanup screen config, take 2