Remove some legacy code
Clean up UI locks, plus misc cleanup