Some cleanup.
Start on properties panel