Remove some code accidentaly included. That is for a later patch.