Massive cleanup of criat module.