TODO things are not needed anymore