Revert useless functionalities