Cleaned up invalid property usage