Removed unneeded properties and code.