removed some not-yet ready funtionality