Chiguru Playhome v2.0 cleanup