Removed unneeded custom double buffering