Removed some fmt and old code