Remove this unfinished section
some more changes