Cleaned up various modules.