Final clearing up for today, got rid of some legacy drawing algorithms