remove current_user code