Removed couple empty compliation units. Removed duplicate function