Dead code :S we should remove it