Clean up field type events and removed a bunch of shit