useless constants & variable removal related to prev commit