remove some unfinished stuff