Cleanup old code a bit