Crimson: More property clean up