30/4/2013 removed unsused code