[REM] cleanup of unecessary functions and fields