Main module cleanup