interface clean-up, drop of unrelated functionality