cleaned up junky code