constrain visibility to bare minimum, remove functionality not used at the moment
sufficient for a version