Fix: unset variables to work with PHP 8
Fix: unset variables to work with PHP 8

Also, clean up and simplify a bit
hissy/concrete5,deek87/concrete5,concrete5/concrete5,concrete5/concrete5,biplobice/concrete5,hissy/concrete5,deek87/concrete5,haeflimi/concrete5,biplobice/concrete5,biplobice/concrete5,jaromirdalecky/concrete5,haeflimi/concrete5,hissy/concrete5,haeflimi/concrete5,haeflimi/concrete5,deek87/concrete5,mlocati/concrete5,mlocati/concrete5,concrete5/concrete5,concrete5/concrete5,hissy/concrete5,biplobice/concrete5,mlocati/concrete5,jaromirdalecky/concrete5,jaromirdalecky/concrete5,mlocati/concrete5,jaromirdalecky/concrete5,deek87/concrete5