More cleanups and trying to improve performance with less draw routines this time