Remove references to unused modules