Revert "Revert "Revert "adjusting some of the properties"""

This reverts commit bec7657bd9ee2b297e0a573286825a98df8beccb.
Revert "Cleanup"

This reverts commit a2030f84c501df3cb8299cf79f1505118c2570c9.