removed a bunch of uncessarry Unit properties that were no longer needed