Remove unnecessary inline-variables