Remove stuff which does not work at the moment