remove functionality to make more compact