Cleanup removal of unused modules