Stripping down more unnecessary code