Cleanup code , Property loader