* Removed more unnecessary properties