cleanup: remove unused code
remove unused property
rename property + description