cleaned up code junk