Remove/hide fields

Thank you @Vernam solved a problem we were facing as well.