Removed duplicated id code