cleaned up junk