remove unnecessary for this moment code