layout.cpp: removed some TODOs