Remove a couple lines of code