cleaning up & removing DEBUG flag.