Feature/fieldcleanup