[Elements.h] Full cleanup