Move screen clearing into route wrapper