Parts of code are broken but we are even closer to a full cleanup.