Removed some unneeded properties.