Much needed cleanup of common and init files