Remove use of modules