[CLEANUP] element class

Cleanup of the element class from scrutinizer input.