Added functionality for removing modules