Massive cleanup after real device testing