Removing 0.6 support