Fixed property override for php 5.3.
Cleanup.