One Time Property Cleanups

One Time Property Cleanups