Cleanup + I know... "Never change a running system" -> It isn't working anymore  ;(