Outcommented stuff

1.6 compatability