Cleanup obsolete comments. Remove layout listener