Code optimization

Fix code unuseless