Remove unused debug, faster processing, cleanup