Removed some unnecessary properties stuff