removed old unused stuff
Merge commit 'de30268c83ab8ca8656818bcc5aeb67a514b792d'