[MF] Code clean up

remove a lot of debuging code