Remove parts of the code that is used nowhere and is not compatible with strict_variables