[DEV] some other rework unneeded elements