Cleaned up module inclusion