Cleanup, re-added property