remove some unnecessary code untill fully implemented