Removing cruft and using VAO's correctly(I think)