refactor. rm deprecated elements