some concepts cleanup