First step of performance fixes. Nothing is working now, but at least this nothing is not working fast enough.