Remove unneeded properties