Almost useless commit

Changes that were not supposed to make, sort of reverted