Remove what seems to be not needed
wip