[Downtime] Code cleanup