Clean up leftover code
Need to keep doing this until we have typed fields