Removing unneeded properties