Remove special case for module references