Cleanup to prepare move to screens