wmcore code clean