Clean the code by removing useless properties