Remove legacy sources
constant fix
Improved screen cell iteration logic