Remove commented and so far unsuded code