fix vsync bug, remove old stuff