Commented not used code