Removed debug code
Removed unnecessary properties