Clean up and removed text drawing for now