some cleanup for home debug