Module support files and cleanup