Removed unnecessary properties