Remove marcos module from 8.0 brach