Chiguru Playhome v2.0 clean up