Clean up logging
Rebuilt modules