Commit to remove a bunch of commented out code
Pre-cleanup of section2 to drastically simplify icon containers
test