Remove render call (hack on top of hack, ...) #FIX